bitkeeper revision 1.1288 (425b9987hyix49ReaseCwzMc1AFxcQ)

Hand merged

diff --cc linux-2.6.11-xen-sparse/arch/xen/Kconfig
Simple merge

diff --cc linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
index 9b94c7d855da63e1a842f106388f7722f7334493,4ec4c44bfc02f7f13aa13c7094523f1f81fd45ff..276f0ad1cd9320ed09ea47dfa44ccdc88bbf07d7
--- 1/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
--- 2/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
@@@ -17,9 -17,10 +17,10 @@@ CONFIG_XEN_BLKDEV_FRONTEND=
  CONFIG_XEN_NETDEV_FRONTEND=y
  # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
  # CONFIG_XEN_BLKDEV_TAP is not set
+ CONFIG_XEN_SHADOW_MODE=y
  CONFIG_XEN_SCRUB_PAGES=y
 -CONFIG_X86=y
 -# CONFIG_X86_64 is not set
 +CONFIG_XEN_X86=y
 +# CONFIG_XEN_X86_64 is not set
  CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
  
  #

diff --cc linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
index df713aa9eaf8cc48e255fbd0e11e23b7ade82511,f64d1caffb9ad563eda610745e5e885b6cb8ba76..1f4f3e2bcf016e0d73da4910b31ba8a9e4e36c52
--- 1/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
--- 2/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
@@@ -73,23 -71,26 +73,34 @@@ void lgdt_finish(void)
   * be MACHINE addresses.
   */
  
- void xen_l1_entry_update(pte_t *ptr, unsigned long val);
- void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
- void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64 only */
- void xen_l4_entry_update(pgd_t *ptr, pgd_t val); /* x86_64 only */
  void xen_pt_switch(unsigned long ptr);
 +void xen_new_user_pt(unsigned long ptr); /* x86_64 only */
 +void xen_load_gs(unsigned int selector); /* x86_64 only */
  void xen_tlb_flush(void);
  void xen_invlpg(unsigned long ptr);
+ 
+ #ifndef CONFIG_XEN_SHADOW_MODE
+ void xen_l1_entry_update(pte_t *ptr, unsigned long val);
+ void xen_l2_entry_update(pmd_t *ptr, pmd_t val);
++void xen_l3_entry_update(pud_t *ptr, pud_t val); /* x86_64 only */
++void xen_l4_entry_update(pgd_t *ptr, pgd_t val); /* x86_64 only */
  void xen_pgd_pin(unsigned long ptr);
  void xen_pgd_unpin(unsigned long ptr);
 +void xen_pud_pin(unsigned long ptr); /* x86_64 only */
 +void xen_pud_unpin(unsigned long ptr); /* x86_64 only */
 +void xen_pmd_pin(unsigned long ptr); /* x86_64 only */
 +void xen_pmd_unpin(unsigned long ptr); /* x86_64 only */
  void xen_pte_pin(unsigned long ptr);
  void xen_pte_unpin(unsigned long ptr);
+ #else
+ #define xen_l1_entry_update(_p, _v) set_pte((_p), (pte_t){(_v)})
+ #define xen_l2_entry_update(_p, _v) set_pgd((_p), (pgd_t){(_v)})
+ #define xen_pgd_pin(_p)   ((void)0)
+ #define xen_pgd_unpin(_p) ((void)0)
+ #define xen_pte_pin(_p)   ((void)0)
+ #define xen_pte_unpin(_p) ((void)0)
+ #endif
+ 
  void xen_set_ldt(unsigned long ptr, unsigned long bytes);
  void xen_machphys_update(unsigned long mfn, unsigned long pfn);
  

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/shadow.c
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge